projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6a9fd59 defe6a7)
bitkeeper revision 1.1159.217.12 (41e53bd9y3GpK3IRHZDW920VkztFhg)
authorkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Wed, 12 Jan 2005 15:01:45 +0000 (15:01 +0000)
committerkaf24@scramble.cl.cam.ac.uk <kaf24@scramble.cl.cam.ac.uk>
Wed, 12 Jan 2005 15:01:45 +0000 (15:01 +0000)
Merge scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk

1  2 
xen/arch/x86/x86_32/seg_fixup.c patch | diff1 | diff2 | blob | history

diff --cc xen/arch/x86/x86_32/seg_fixup.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.